Skip to content

Update gpu atomics include path#4478

Merged
datumbox merged 3 commits intopytorch:mainfrom
peterbell10:atomic-include
Sep 27, 2021
Merged

Update gpu atomics include path#4478
datumbox merged 3 commits intopytorch:mainfrom
peterbell10:atomic-include

Conversation

@peterbell10
Copy link
Contributor

@peterbell10 peterbell10 commented Sep 24, 2021

THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.

@peterbell10
Update gpu atomics include path
d151c10 
THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.
@datumbox
Copy link
Contributor

datumbox commented Sep 24, 2021

@peterbell10 Thanks for the PR.

The failures on CI seem related:

FAILED: /root/project/build/temp.linux-x86_64-3.6/root/project/torchvision/csrc/ops/hip/ps_roi_pool_kernel.o 
/opt/rocm-4.1.0/bin/hipcc  -DWITH_HIP -I/root/project/torchvision/csrc -I/opt/python/cp36-cp36m/lib/python3.6/site-packages/torch/include -I/opt/python/cp36-cp36m/lib/python3.6/site-packages/torch/include/torch/csrc/api/include -I/opt/python/cp36-cp36m/lib/python3.6/site-packages/torch/include/TH -I/opt/python/cp36-cp36m/lib/python3.6/site-packages/torch/include/THC -I/opt/python/cp36-cp36m/lib/python3.6/site-packages/torch/include/THH -I/opt/rocm-4.1.0/include -I/opt/rocm-4.1.0/miopen/include -I/root/project/ext_libraries/include -I/opt/python/cp36-cp36m/include/python3.6m -c -c /root/project/torchvision/csrc/ops/hip/ps_roi_pool_kernel.hip -o /root/project/build/temp.linux-x86_64-3.6/root/project/torchvision/csrc/ops/hip/ps_roi_pool_kernel.o -fPIC -D__HIP_PLATFORM_HCC__=1 -DCUDA_HAS_FP16=1 -D__HIP_NO_HALF_OPERATORS__=1 -D__HIP_NO_HALF_CONVERSIONS__=1 -DTORCH_API_INCLUDE_EXTENSION_H '-DPYBIND11_COMPILER_TYPE="_gcc"' '-DPYBIND11_STDLIB="_libstdcpp"' '-DPYBIND11_BUILD_ABI="_cxxabi1011"' -DTORCH_EXTENSION_NAME=_C -D_GLIBCXX_USE_CXX11_ABI=0 --amdgpu-target=gfx803 --amdgpu-target=gfx900 --amdgpu-target=gfx906 --amdgpu-target=gfx908 -fno-gpu-rdc -std=c++14
In file included from /root/project/torchvision/csrc/ops/hip/ps_roi_pool_kernel.hip:5:
/opt/python/cp36-cp36m/lib/python3.6/site-packages/torch/include/ATen/hip/impl/HIPGuardImplMasqueradingAsCUDA.h:102:5: warning: 'deviceCount' has a non-throwing exception specification but can still throw [-Wexceptions]
    C10_HIP_CHECK(hipGetDeviceCount(&deviceCnt));
    ^
/opt/python/cp36-cp36m/lib/python3.6/site-packages/torch/include/c10/hip/HIPException.h:44:7: note: expanded from macro 'C10_HIP_CHECK'
      throw c10::HIPError(                                         \
      ^
/opt/python/cp36-cp36m/lib/python3.6/site-packages/torch/include/ATen/hip/impl/HIPGuardImplMasqueradingAsCUDA.h:100:15: note: function declared non-throwing here
  DeviceIndex deviceCount() const noexcept override {
              ^                   ~~~~~~~~
/root/project/torchvision/csrc/ops/hip/ps_roi_pool_kernel.hip:7:10: fatal error: 'ATen/hip/Atomic.cuh' file not found
#include <ATen/hip/Atomic.cuh>
         ^~~~~~~~~~~~~~~~~~~~~
1 warning and 1 error generated when compiling for gfx803.

@peterbell10
Copy link
Contributor Author

peterbell10 commented Sep 24, 2021

I think we just need to wait for a new nightly release.

datumbox
datumbox approved these changes Sep 27, 2021
View reviewed changes
Copy link
Contributor

@datumbox datumbox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@datumbox datumbox merged commit 3e27eb2 into pytorch:main Sep 27, 2021
facebook-github-bot pushed a commit that referenced this pull request Sep 30, 2021
@NicolasHug @datumbox @facebook-github-bot
[fbsync] Update gpu atomics include path (#4478)
80c7790 
Summary:
* Update gpu atomics include path

THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.

* Empty commit to trigger build

Reviewed By: datumbox

Differential Revision: D31268022

fbshipit-source-id: 880981b5b4390a6853fe0061cd9a3be0afa733e7

Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>
malfet added a commit that referenced this pull request Oct 6, 2021
@malfet
Revert "Update gpu atomics include path (#4478)"
0429471 
This reverts commit 3e27eb2.
husthyc added a commit that referenced this pull request Oct 22, 2021
@husthyc
Update gpu atomics include path (#4478)
04af1d5 
* Update gpu atomics include path

THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.

* Empty commit to trigger build

Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>

[ghstack-poisoned]
husthyc added a commit that referenced this pull request Oct 22, 2021
@husthyc
Update gpu atomics include path (#4478)
7be58f5 
* Update gpu atomics include path

THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.

* Empty commit to trigger build

Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>

[ghstack-poisoned]
cyyever pushed a commit to cyyever/vision that referenced this pull request Nov 16, 2021
@peterbell10 @datumbox @cyyever
Update gpu atomics include path (pytorch#4478)
884491b 
* Update gpu atomics include path

THC is being removed, and this header now lives in ATen.
See pytorch/pytorch#65470.

* Empty commit to trigger build

Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@datumbox datumbox datumbox approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla signed code quality module: ops

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@peterbell10 @datumbox @NicolasHug @facebook-github-bot